bitkeeper revision 1.1320 (42642ddapSMPP0vKzhY_zJP6GaMQ7A)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk

diff --cc .rootkeys
index f34bc1fa4fc7e32db735d2273822343c0e6d58c3,e57d34ae76761b96e47ea1a9cf7fd5c0dfceb6e1..3d59bded888cfeb81b03342037d97dcc3bdc27e4
--- 1/.rootkeys
--- 2/.rootkeys
+++ b/.rootkeys
@@@ -46,10 -43,9 +46,11 @@@
  3f815145CB8XdPUqsmhAjSDFuwOoqA extras/mini-os/mm.c
  3f815145vGYx1WY79voKkZB9yKwJKQ extras/mini-os/time.c
  3f815145xlKBAQmal9oces3G_Mvxqw extras/mini-os/traps.c
 +3f815145W2mamPMclRLOzm5B38vWUQ extras/mini-os/x86_32.S
 +420c983dAE5qEtJMI6wHAQnHVJ1r2g extras/mini-os/x86_64.S
  423e7e86yUUeeOvTAmjIahrpk1ksaQ freebsd-5.3-xen-sparse/conf/Makefile.i386-xen
  423e7e86CSWbA9G8OftmMbfhStuQ6Q freebsd-5.3-xen-sparse/conf/files.i386-xen
+ 42642db9m5qcqIrsHX8QlcBGeKSAmw freebsd-5.3-xen-sparse/conf/kern.mk
  423e7e86m-vV5fQ_32CjcFMEr77Fyg freebsd-5.3-xen-sparse/conf/ldscript.i386-xen
  423e7e86Fo2PxRS_37IwkpH-x5t5xQ freebsd-5.3-xen-sparse/conf/options.i386-xen
  423e7e868Yt0iZuEeccnczyToPPvow freebsd-5.3-xen-sparse/fbsdxensetup

diff --cc tools/libxc/xc_domain.c
Simple merge